Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 27 Feb 2010 00:41:17 +0000 (00:41 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 27 Feb 2010 00:41:17 +0000 (00:41 +0000)

Trivial merge